don't send a 0 length buffer.

1999-10-28  Jonathan Blandford  <jrb@redhat.com>

	* src/gdk-pixbuf-loader.c (gdk_pixbuf_loader_write): don't send a
	0 length buffer.

diff --git a/gdk-pixbuf/gdk-pixbuf-loader.c b/gdk-pixbuf/gdk-pixbuf-loader.c
index c7c6c5cca60012c6a98471267140fc0ee66f102b..db734ef63199cd954fb89ad38041e6ea55b5571f 100644 (file)
--- a/gdk-pixbuf/gdk-pixbuf-loader.c
+++ b/gdk-pixbuf/gdk-pixbuf-loader.c
@@ -292,7 +292,7 @@ gdk_pixbuf_loader_write (GdkPixbufLoader *loader, guchar *buf, size_t count)
                                 * to send the rest of the buffer.
                                 */
 
-                               if (retval && (priv->buf_offset + count) >= 128) {
+                               if (retval && (priv->buf_offset + count) > 128) {
                                        retval = (* priv->image_module->load_increment) (
                                                priv->context,
                                                buf,

diff --git a/gdk-pixbuf/io-gif.c b/gdk-pixbuf/io-gif.c
index 38080c8e495cb8d71cb3ed9991315330dede1883..7e19014d49d97f625bf1b72a5945dcea1dbe311a 100644 (file)
--- a/gdk-pixbuf/io-gif.c
+++ b/gdk-pixbuf/io-gif.c
@@ -216,7 +216,7 @@ myInputFunc (GifFileType *type, GifByteType *byte, int length)
 {
        GifData *context;
 
-       context = (GifData *) type->UserData;
+       context = (GifData *) (type->UserData);
        g_print ("in myInputFunc\nSize requested is %d\n", length);
 
        if (length > context->size - context->ptr) {

diff --git a/gdk/gdkpixbuf-render.c b/gdk/gdkpixbuf-render.c
index 87f508c40b518ab53a6be378af9d4cc9b15097a0..312f4b1833e1aecf6eae2f14c3265f8d0ef497ba 100644 (file)
--- a/gdk/gdkpixbuf-render.c
+++ b/gdk/gdkpixbuf-render.c
@@ -168,9 +168,9 @@ gdk_pixbuf_render_to_drawable (GdkPixbuf *pixbuf, GdkDrawable *drawable,
        /* Sigh, GdkRGB does not have gdk_draw_rgb_32_image_dithalign(), so we
         * have to pack the buffer first.
         */
-       if (apb->has_alpha)
-               buf = remove_alpha (apb, src_x, src_y, width, height, &rowstride);
-       else {
+       if (apb->has_alpha) {
+//             buf = remove_alpha (apb, src_x, src_y, width, height, &rowstride);
+       } else {
                buf = apb->pixels + src_y * apb->rowstride + src_x * 3;
                rowstride = apb->rowstride;
        }

diff --git a/gtk/gdk-pixbuf-loader.c b/gtk/gdk-pixbuf-loader.c
index c7c6c5cca60012c6a98471267140fc0ee66f102b..db734ef63199cd954fb89ad38041e6ea55b5571f 100644 (file)
--- a/gtk/gdk-pixbuf-loader.c
+++ b/gtk/gdk-pixbuf-loader.c
@@ -292,7 +292,7 @@ gdk_pixbuf_loader_write (GdkPixbufLoader *loader, guchar *buf, size_t count)
                                 * to send the rest of the buffer.
                                 */
 
-                               if (retval && (priv->buf_offset + count) >= 128) {
+                               if (retval && (priv->buf_offset + count) > 128) {
                                        retval = (* priv->image_module->load_increment) (
                                                priv->context,
                                                buf,